Hi All!
Simple update to qt-creator 4.3.0. Nothing special, a little Makefile
clean up and take MAINTAINER. Tested on amd64.
Tests, comments and OKs welcome.
Best regards
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 31 May 2017 08:08:15 -0000 1.23
+++ Makefile 7 Jun 2017 09:05:42 -0000
@@ -1,32 +1,27 @@
# $OpenBSD: Makefile,v 1.23 2017/05/31 08:08:15 espie Exp $
COMMENT = cross-platform IDE for use with Qt
-V = 4.2.2
+V = 4.3.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
-REVISION = 0
-
-# TODO:
-# * Verify that patch for src/shared/qbs/src/lib/corelib/tools/processutils.cpp
-# does what it is supposed to do.
SHARED_LIBS += Aggregation 0.0 # 0.0
-SHARED_LIBS += CPlusPlus 0.0 # 0.0
-SHARED_LIBS += ExtensionSystem 1.0 # 0.0
+SHARED_LIBS += CPlusPlus 1.0 # 0.0
+SHARED_LIBS += ExtensionSystem 2.0 # 0.0
SHARED_LIBS += GLSL 0.0 # 0.0
SHARED_LIBS += LanguageUtils 0.0 # 0.0
-SHARED_LIBS += QmlDebug 1.0 # 0.0
+SHARED_LIBS += QmlDebug 2.0 # 0.0
SHARED_LIBS += QmlEditorWidgets 0.0 # 0.0
-SHARED_LIBS += QmlJS 1.0 # 0.0
+SHARED_LIBS += QmlJS 2.0 # 0.0
SHARED_LIBS += QtcSsh 0.0 # 0.0
-SHARED_LIBS += Utils 1.0 # 0.0
-SHARED_LIBS += qbscore 1.0 # 0.0
-SHARED_LIBS += Clangbackendipc 1.1 # 1.0
+SHARED_LIBS += Utils 2.0 # 0.0
+SHARED_LIBS += qbscore 2.0 # 0.0
+SHARED_LIBS += Clangbackendipc 2.1 # 1.0
SHARED_LIBS += Sqlite 1.1 # 1.0
-SHARED_LIBS += Timeline 1.1 # 1.0
+SHARED_LIBS += Timeline 2.1 # 1.0
SHARED_LIBS += qbsqtprofilesetup 1.4 # 1.4
-SHARED_LIBS += Modeling 1.0 # 1.0
-SHARED_LIBS += FlameGraph 0.0 # 4.2
+SHARED_LIBS += Modeling 1.0 # 1.0
+SHARED_LIBS += FlameGraph 0.0 # 4.2
MAKE_FLAGS = BUILD_TESTS=1
.for _l _v in ${SHARED_LIBS}
@@ -37,6 +32,8 @@ CATEGORIES = devel editors
HOMEPAGE = https://www.qt.io/ide/
+MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
+
# GPLv3 with the "Qt Company GPL Exception 1.0"
PERMIT_PACKAGE_CDROM = Yes
@@ -47,7 +44,8 @@ WANTLIB += Qt5Xml c kvm m pthread ${LIBE
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
-MODULES = x11/qt5 devel/qmake
+MODULES = x11/qt5 \
+ devel/qmake
MODQMAKE_INSTALL_ROOT = ${PREFIX}
# qtcreator.sh is created with custom LINK?= in Makefile
MODQT5_USE_GCC4_MODULE = No
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 28 Apr 2017 16:00:10 -0000 1.4
+++ distinfo 7 Jun 2017 09:05:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.2.2.tar.gz) =
BALw4zvzyO5/icZz8l/Pdf7wO6QmLgd9nZ9CRU0eeZs=
-SIZE (qt-creator-opensource-src-4.2.2.tar.gz) = 22574932
+SHA256 (qt-creator-opensource-src-4.3.0.tar.gz) =
t+5n2T4UKH8U4sGzdlFuhDyCUgOE++dk7z1ed/9NlkY=
+SIZE (qt-creator-opensource-src-4.3.0.tar.gz) = 23343002
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.2
diff -u -p -u -p -r1.2 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 28 Apr 2017
16:00:10 -0000 1.2
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 7 Jun 2017
09:05:42 -0000
@@ -2,14 +2,15 @@ $OpenBSD: patch-src_plugins_projectexplo
Append eg++ before g++ so eg++ is used by default.
---- src/plugins/projectexplorer/gcctoolchain.cpp.orig Wed Mar 22 09:25:13 2017
-+++ src/plugins/projectexplorer/gcctoolchain.cpp Mon Apr 24 18:05:10 2017
-@@ -606,7 +606,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+Index: src/plugins/projectexplorer/gcctoolchain.cpp
+--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
++++ src/plugins/projectexplorer/gcctoolchain.cpp
+@@ -723,7 +723,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
-- QString make = QLatin1String("make");
-+ QString make = QLatin1String("gmake");
+- QString make = "make";
++ QString make = "gmake";
FileName tmp = environment.searchInPath(make);
return tmp.isEmpty() ? make : tmp.toString();
}
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.2
diff -u -p -u -p -r1.2
patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
28 Apr 2017 16:00:10 -0000 1.2
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
7 Jun 2017 09:05:42 -0000
@@ -4,9 +4,10 @@ When calling gmake, override the CXX and
by qmake by setting gmake's command line arguments. Makes it possible to
compile C++11 code.
---- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig Thu Jan
19 16:04:00 2017
-+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp Thu Jan
26 23:22:01 2017
-@@ -671,6 +671,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
+Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
++++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+@@ -677,6 +677,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
buildSteps->insertStep(0, qmakeStep);
MakeStep *makeStep = new MakeStep(buildSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2
patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 28 Apr
2017 16:00:10 -0000 1.2
+++ patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 7 Jun
2017 09:05:42 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.2
2017/04/28 16:00:10 rsadowski Exp $
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig Thu Jan 5
18:01:57 2017
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp Thu Jan 26
23:22:01 2017
+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>
@@ -11,7 +12,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_c
+# include <fcntl.h>
+# include <kvm.h>
#elif defined(Q_OS_BSD4)
- # include <QFile>
+ # include <QtCore/qfile.h>
# include <sys/cdefs.h>
@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
sprintf(exePath, "/proc/%lld/exe", pid);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 28 Apr
2017 16:00:10 -0000 1.2
+++ patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 7 Jun
2017 09:05:42 -0000
@@ -1,12 +1,16 @@
$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.2
2017/04/28 16:00:10 rsadowski Exp $
---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig Thu Jan 5
18:01:57 2017
-+++ src/shared/qbs/src/lib/corelib/tools/tools.pri Thu Jan 26 23:22:01 2017
-@@ -93,6 +93,8 @@ osx {
+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
+@@ -102,6 +102,11 @@ osx {
LIBS += -framework Security
}
-+openbsd:LIBS += -lkvm
++openbsd {
++ LIBS += -lkvm
++}
+
- win32 {
- SOURCES += $$PWD/filetime_win.cpp
- }
++
+ qbs_enable_unit_tests {
+ HEADERS += $$PWD/tst_tools.h
+ SOURCES += $$PWD/tst_tools.cpp
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 28 Apr 2017 16:00:10 -0000 1.4
+++ pkg/PLIST 7 Jun 2017 09:05:42 -0000
@@ -2,6 +2,7 @@
@bin bin/qbs
@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
@@ -41,7 +42,9 @@ lib/qtcreator/
@lib lib/qtcreator/libSqlite.so.${LIBSqlite_VERSION}
@lib lib/qtcreator/libTimeline.so.${LIBTimeline_VERSION}
@lib lib/qtcreator/libUtils.so.${LIBUtils_VERSION}
+lib/qtcreator/libqbscore.prl
@lib lib/qtcreator/libqbscore.so.${LIBqbscore_VERSION}
+lib/qtcreator/libqbsqtprofilesetup.prl
@lib lib/qtcreator/libqbsqtprofilesetup.so.${LIBqbsqtprofilesetup_VERSION}
lib/qtcreator/plugins/
lib/qtcreator/plugins/libAndroid.so
@@ -93,6 +96,7 @@ lib/qtcreator/plugins/libQtSupport.so
lib/qtcreator/plugins/libRemoteLinux.so
lib/qtcreator/plugins/libResourceEditor.so
lib/qtcreator/plugins/libScxmlEditor.so
+lib/qtcreator/plugins/libSilverSearcher.so
lib/qtcreator/plugins/libSubversion.so
lib/qtcreator/plugins/libTaskList.so
lib/qtcreator/plugins/libTextEditor.so
@@ -112,6 +116,7 @@ lib/qtcreator/plugins/qmldesigner/libqtq
libexec/qtcreator/
@bin libexec/qtcreator/buildoutputparser
@bin libexec/qtcreator/cpaster
+@bin libexec/qtcreator/qbs_processlauncher
@bin libexec/qtcreator/qml2puppet
@bin libexec/qtcreator/qtcreator_process_stub
@bin libexec/qtcreator/qtpromaker
@@ -168,6 +173,7 @@ share/qtcreator/generic-highlighter/html
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
@@ -260,10 +266,25 @@ share/qtcreator/qbs/share/qbs/examples/h
share/qtcreator/qbs/share/qbs/examples/helloworld-qt/hello.qbs
share/qtcreator/qbs/share/qbs/examples/helloworld-qt/main.cpp
share/qtcreator/qbs/share/qbs/examples/install-bundle/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/MainMenu.xib
+share/qtcreator/qbs/share/qbs/examples/install-bundle/Storyboard.storyboard
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog1.xcassets/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog1.xcassets/other.imageset/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog1.xcassets/other.imageset/Contents.json
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog1.xcassets/other.imageset/icon_16x16.png
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog1.xcassets/other.imageset/icon_16...@2x.png
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog2.xcassets/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog2.xcassets/other.imageset/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog2.xcassets/other.imageset/Contents.json
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog2.xcassets/other.imageset/icon_16x16.png
+share/qtcreator/qbs/share/qbs/examples/install-bundle/assetcatalog2.xcassets/other.imageset/icon_16...@2x.png
share/qtcreator/qbs/share/qbs/examples/install-bundle/coreutils.cpp
share/qtcreator/qbs/share/qbs/examples/install-bundle/coreutils.h
share/qtcreator/qbs/share/qbs/examples/install-bundle/install-bundle.qbs
share/qtcreator/qbs/share/qbs/examples/install-bundle/main.cpp
+share/qtcreator/qbs/share/qbs/examples/install-bundle/white.iconset/
+share/qtcreator/qbs/share/qbs/examples/install-bundle/white.iconset/icon_16x16.png
+share/qtcreator/qbs/share/qbs/examples/install-bundle/white.iconset/icon_16...@2x.png
share/qtcreator/qbs/share/qbs/imports/
share/qtcreator/qbs/share/qbs/imports/qbs/
share/qtcreator/qbs/share/qbs/imports/qbs/BundleTools/
@@ -345,11 +366,14 @@ share/qtcreator/qbs/share/qbs/modules/cp
share/qtcreator/qbs/share/qbs/modules/cpp/LinuxGCC.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/UnixGCC.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/android-gcc.qbs
+share/qtcreator/qbs/share/qbs/modules/cpp/freebsd-gcc.qbs
+share/qtcreator/qbs/share/qbs/modules/cpp/freebsd.js
share/qtcreator/qbs/share/qbs/modules/cpp/gcc.js
share/qtcreator/qbs/share/qbs/modules/cpp/genericunix-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/ios-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/macos-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/msvc.js
+share/qtcreator/qbs/share/qbs/modules/cpp/qnx-qcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/tvos-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/watchos-gcc.qbs
share/qtcreator/qbs/share/qbs/modules/cpp/windows-mingw.qbs
@@ -388,6 +412,8 @@ share/qtcreator/qbs/share/qbs/modules/ns
share/qtcreator/qbs/share/qbs/modules/nsis/NSISModule.qbs
share/qtcreator/qbs/share/qbs/modules/qbs/
share/qtcreator/qbs/share/qbs/modules/qbs/common.qbs
+share/qtcreator/qbs/share/qbs/modules/qnx/
+share/qtcreator/qbs/share/qbs/modules/qnx/qnx.qbs
share/qtcreator/qbs/share/qbs/modules/typescript/
share/qtcreator/qbs/share/qbs/modules/typescript/TypeScriptModule.qbs
share/qtcreator/qbs/share/qbs/modules/typescript/qbs-tsc-scan/
@@ -633,6 +659,7 @@ share/qtcreator/qmldesigner/propertyEdit
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/MarginSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/OriginControl.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/PaddingSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml
@@ -675,6 +702,11 @@ share/qtcreator/qmldesigner/propertyEdit
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ColumnSpecifics.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DialogSpecifics.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DrawerSpecifics.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PopupSection.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PopupSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/FlickableSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/FlipableSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/FlowSpecifics.qml
@@ -805,13 +837,11 @@ share/qtcreator/templates/wizards/README
share/qtcreator/templates/wizards/autotest/
share/qtcreator/templates/wizards/autotest/autotest_24.png
share/qtcreator/templates/wizards/autotest/files/
-share/qtcreator/templates/wizards/autotest/files/auto.pro
+share/qtcreator/templates/wizards/autotest/files/googlecommon.js
share/qtcreator/templates/wizards/autotest/files/gtest_dependency.pri
-share/qtcreator/templates/wizards/autotest/files/main.cpp
-share/qtcreator/templates/wizards/autotest/files/src.pro
-share/qtcreator/templates/wizards/autotest/files/tests.pro
-share/qtcreator/templates/wizards/autotest/files/tmp.pro
share/qtcreator/templates/wizards/autotest/files/tst.pro
+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_src.cpp
share/qtcreator/templates/wizards/autotest/files/tst_src.h
@@ -905,6 +935,12 @@ share/qtcreator/templates/wizards/global
share/qtcreator/templates/wizards/global/genericfilewizard.png
share/qtcreator/templates/wizards/global/guiapplication.png
share/qtcreator/templates/wizards/projects/
+share/qtcreator/templates/wizards/projects/consoleapp/
+share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
+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/git.ignore
share/qtcreator/templates/wizards/projects/nim/
share/qtcreator/templates/wizards/projects/nim/file.nimproject
@@ -924,57 +960,48 @@ share/qtcreator/templates/wizards/projec
share/qtcreator/templates/wizards/projects/plaincpp/main.cpp
share/qtcreator/templates/wizards/projects/plaincpp/wizard.json
share/qtcreator/templates/wizards/projects/qmake/
-share/qtcreator/templates/wizards/projects/qmake/consoleapp/
-share/qtcreator/templates/wizards/projects/qmake/consoleapp/file.pro
-share/qtcreator/templates/wizards/projects/qmake/consoleapp/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/consoleapp/wizard.json
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/qmake/qtcanvas3dapplication/
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/3dapplication.png
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/app.pro
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/main.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/plaincanvas3d/
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/plaincanvas3d/glcode.js
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/qml.qrc
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/3rdparty/
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/3rdparty/three.js
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/glcode.js
-share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/wizard.json
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/MainForm.ui.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/app.pro
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml.qrc
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/qml_wizard.png
-share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/Page1.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/Page1Form.ui.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/app.pro
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/main.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/qml.qrc
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/qtquickcontrols2.conf
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrols2application/wizard.json
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/MainForm.ui.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/app.pro
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.cpp
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.qml.tpl
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/qml.qrc
-share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
-share/qtcreator/templates/wizards/projects/qmlproject/
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/app.qmlproject
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/app.qmlproject
-share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/3dapplication.png
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/CMakeLists.txt
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/app.pro
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/file.qbs
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/main.cpp
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/plaincanvas3d/
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/plaincanvas3d/glcode.js
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/qml.qrc
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/threejs/
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/threejs/3rdparty/
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/threejs/3rdparty/three.js
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/threejs/glcode.js
+share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickapplication/
+share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
+share/qtcreator/templates/wizards/projects/qtquickapplication/MainForm.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
+share/qtcreator/templates/wizards/projects/qtquickapplication/file.qbs
+share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp
+share/qtcreator/templates/wizards/projects/qtquickapplication/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/qml_wizard.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/CMakeLists.txt
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/Page1.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/Page1Form.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/app.pro
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/file.qbs
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/main.cpp
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/qtquickcontrols2.conf
+share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickuiprototype/
+share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject
+share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
share/qtcreator/templates/wizards/projects/vcs/
share/qtcreator/templates/wizards/projects/vcs/bazaar/
share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png
@@ -1000,15 +1027,6 @@ share/qtcreator/templates/wizards/qtcrea
share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h
share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png
share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
-share/qtcreator/templates/wizards/qtquick1-extension/
-share/qtcreator/templates/wizards/qtquick1-extension/lib.png
-share/qtcreator/templates/wizards/qtquick1-extension/object.cpp
-share/qtcreator/templates/wizards/qtquick1-extension/object.h
-share/qtcreator/templates/wizards/qtquick1-extension/plugin.cpp
-share/qtcreator/templates/wizards/qtquick1-extension/plugin.h
-share/qtcreator/templates/wizards/qtquick1-extension/project.pro
-share/qtcreator/templates/wizards/qtquick1-extension/qmldir
-share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml
share/qtcreator/templates/wizards/qtquick2-extension/
share/qtcreator/templates/wizards/qtquick2-extension/lib.png
share/qtcreator/templates/wizards/qtquick2-extension/object.cpp
@@ -1026,6 +1044,7 @@ share/qtcreator/themes/flat-light.creato
share/qtcreator/themes/flat.creatortheme
share/qtcreator/translations/
share/qtcreator/translations/qtcreator_cs.qm
+share/qtcreator/translations/qtcreator_da.qm
share/qtcreator/translations/qtcreator_de.qm
share/qtcreator/translations/qtcreator_fr.qm
share/qtcreator/translations/qtcreator_ja.qm
@@ -1035,72 +1054,5 @@ share/qtcreator/translations/qtcreator_s
share/qtcreator/translations/qtcreator_uk.qm
share/qtcreator/translations/qtcreator_zh_CN.qm
share/qtcreator/translations/qtcreator_zh_TW.qm
-share/qtcreator/welcomescreen/
-share/qtcreator/welcomescreen/develop.qml
-share/qtcreator/welcomescreen/dummydata/
-share/qtcreator/welcomescreen/dummydata/examplesModel.qml
-share/qtcreator/welcomescreen/dummydata/pagesModel.qml
-share/qtcreator/welcomescreen/dummydata/projectList.qml
-share/qtcreator/welcomescreen/dummydata/sessionList.qml
-share/qtcreator/welcomescreen/dummydata/tutorialsModel.qml
-share/qtcreator/welcomescreen/examples.qml
-share/qtcreator/welcomescreen/images_areaofinterest.xml
-share/qtcreator/welcomescreen/qtcreator_tutorials.xml
-share/qtcreator/welcomescreen/tutorials.qml
-share/qtcreator/welcomescreen/welcomescreen.qml
-share/qtcreator/welcomescreen/welcomescreen.qmlproject
-share/qtcreator/welcomescreen/widgets/
-share/qtcreator/welcomescreen/widgets/Button.qml
-share/qtcreator/welcomescreen/widgets/ComboBox.qml
-share/qtcreator/welcomescreen/widgets/CustomFonts.qml
-share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
-share/qtcreator/welcomescreen/widgets/Delegate.qml
-share/qtcreator/welcomescreen/widgets/IconAndLink.qml
-share/qtcreator/welcomescreen/widgets/NativeText.qml
-share/qtcreator/welcomescreen/widgets/PageLoader.qml
-share/qtcreator/welcomescreen/widgets/ProjectItem.qml
-share/qtcreator/welcomescreen/widgets/RecentProjects.qml
-share/qtcreator/welcomescreen/widgets/SearchBar.qml
-share/qtcreator/welcomescreen/widgets/SessionActionLabel.qml
-share/qtcreator/welcomescreen/widgets/SessionItem.qml
-share/qtcreator/welcomescreen/widgets/Sessions.qml
-share/qtcreator/welcomescreen/widgets/SideBar.qml
-share/qtcreator/welcomescreen/widgets/Tabs.qml
-share/qtcreator/welcomescreen/widgets/ToolTip.qml
-share/qtcreator/welcomescreen/widgets/dummydata/
-share/qtcreator/welcomescreen/widgets/dummydata/context/
-share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
-share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleGridView.qml
-share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
-share/qtcreator/welcomescreen/widgets/dummydata/mockupTags.qml
-share/qtcreator/welcomescreen/widgets/dummydata/pagesModel.qml
-share/qtcreator/welcomescreen/widgets/dummydata/tabsModel.qml
-share/qtcreator/welcomescreen/widgets/images/
-share/qtcreator/welcomescreen/widgets/images/dropshadow.png
-share/qtcreator/welcomescreen/widgets/images/icons/
-share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png
-share/qtcreator/welcomescreen/widgets/images/icons/androidapp.png
-share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png
-share/qtcreator/welcomescreen/widgets/images/icons/ddays13.png
-share/qtcreator/welcomescreen/widgets/images/icons/ddays14.png
-share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png
-share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png
-share/qtcreator/welcomescreen/widgets/images/icons/tutorialicon.png
-share/qtcreator/welcomescreen/widgets/images/icons/videoIcon.png
-share/qtcreator/welcomescreen/widgets/images/icons/worldsummit15.png
-share/qtcreator/welcomescreen/widgets/images/icons/worldsummit16.png
-share/qtcreator/welcomescreen/widgets/images/mockup/
-share/qtcreator/welcomescreen/widgets/images/mockup/designer-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/desktop-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/draganddrop-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/itemview-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/layout-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/mainwindow-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/network-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/opengl-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/penguin.png
-share/qtcreator/welcomescreen/widgets/images/mockup/qtscript-examples.png
-share/qtcreator/welcomescreen/widgets/images/mockup/thread-examples.png
-share/qtcreator/welcomescreen/widgets/qmldir
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
