Hi All!
Here is the last one in the Qt chain. Simple diff to the latest stable
version. Works fine here on amd64.
Ok? Comments?
Best regards,
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 16 Nov 2017 23:20:38 -0000 1.31
+++ Makefile 28 Dec 2017 06:15:27 -0000
@@ -4,7 +4,7 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V = 4.4.1
+V = 4.5.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -13,16 +13,16 @@ SHARED_LIBS += CPlusPlus
SHARED_LIBS += ExtensionSystem 3.0 # 0.0
SHARED_LIBS += GLSL 0.0 # 0.0
SHARED_LIBS += LanguageUtils 0.0 # 0.0
-SHARED_LIBS += QmlDebug 2.0 # 0.0
+SHARED_LIBS += QmlDebug 3.0 # 0.0
SHARED_LIBS += QmlEditorWidgets 0.0 # 0.0
-SHARED_LIBS += QmlJS 3.0 # 0.0
+SHARED_LIBS += QmlJS 4.0 # 0.0
SHARED_LIBS += QtcSsh 0.0 # 0.0
-SHARED_LIBS += Utils 3.0 # 0.0
-SHARED_LIBS += Clangbackendipc 2.1 # 1.0
-SHARED_LIBS += Sqlite 2.1 # 1.0
-SHARED_LIBS += Timeline 2.1 # 1.0
-SHARED_LIBS += Modeling 2.0 # 1.0
+SHARED_LIBS += Utils 4.0 # 0.0
+SHARED_LIBS += Sqlite 3.0 # 1.0
+SHARED_LIBS += Timeline 3.0 # 1.0
+SHARED_LIBS += Modeling 3.0 # 1.0
SHARED_LIBS += FlameGraph 0.0 # 4.2
+SHARED_LIBS += Clangsupport 0.0 # 4.5
MAKE_FLAGS = BUILD_TESTS=1
.for _l _v in ${SHARED_LIBS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo 21 Oct 2017 20:04:15 -0000 1.8
+++ distinfo 28 Dec 2017 06:15:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.4.1.tar.gz) =
6Wx8jQ1oO/D8BAXU7RIkxCbOgTUwIVatT5DiHEa1dGU=
-SIZE (qt-creator-opensource-src-4.4.1.tar.gz) = 27604133
+SHA256 (qt-creator-opensource-src-4.5.0.tar.gz) =
EpLpGhjNHwbin2mNUKcyo36Pb3Sxu+IZnJT3RGw3/Ug=
+SIZE (qt-creator-opensource-src-4.5.0.tar.gz) = 28484707
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.4
diff -u -p -u -p -r1.4 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 21 Oct 2017
20:04:15 -0000 1.4
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 28 Dec 2017
06:15:27 -0000
@@ -5,7 +5,7 @@ Append eg++ before g++ so eg++ is used b
Index: src/plugins/projectexplorer/gcctoolchain.cpp
--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -735,7 +735,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+@@ -707,7 +707,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===================================================================
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3
patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
14 Jun 2017 17:11:20 -0000 1.3
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
28 Dec 2017 06:15:27 -0000
@@ -7,7 +7,7 @@ compile C++11 code.
Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -677,6 +677,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
+@@ -679,6 +679,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
buildSteps->insertStep(0, qmakeStep);
MakeStep *makeStep = new MakeStep(buildSteps);
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.4
diff -u -p -u -p -r1.4 patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 21 Sep
2017 19:10:37 -0000 1.4
+++ patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 28 Dec
2017 06:15:27 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_c
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
-@@ -104,6 +104,10 @@ osx {
+@@ -106,6 +106,10 @@ osx {
LIBS += -framework Security
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 21 Sep 2017 19:10:37 -0000 1.6
+++ pkg/PLIST 28 Dec 2017 06:15:27 -0000
@@ -3,7 +3,7 @@
bin/qtcreator.sh
@lib lib/libAggregation.so.${LIBAggregation_VERSION}
@lib lib/libCPlusPlus.so.${LIBCPlusPlus_VERSION}
-@lib lib/libClangbackendipc.so.${LIBClangbackendipc_VERSION}
+@lib lib/libClangsupport.so.${LIBClangsupport_VERSION}
@lib lib/libExtensionSystem.so.${LIBExtensionSystem_VERSION}
@lib lib/libFlameGraph.so.${LIBFlameGraph_VERSION}
@lib lib/libGLSL.so.${LIBGLSL_VERSION}
@@ -19,7 +19,7 @@ bin/qtcreator.sh
lib/qtcreator/
@lib lib/qtcreator/libAggregation.so.${LIBAggregation_VERSION}
@lib lib/qtcreator/libCPlusPlus.so.${LIBCPlusPlus_VERSION}
-@lib lib/qtcreator/libClangbackendipc.so.${LIBClangbackendipc_VERSION}
+@lib lib/qtcreator/libClangsupport.so.${LIBClangsupport_VERSION}
@lib lib/qtcreator/libExtensionSystem.so.${LIBExtensionSystem_VERSION}
@lib lib/qtcreator/libFlameGraph.so.${LIBFlameGraph_VERSION}
@lib lib/qtcreator/libGLSL.so.${LIBGLSL_VERSION}
@@ -135,7 +135,6 @@ share/qtcreator/externaltools/lrelease.x
share/qtcreator/externaltools/lupdate.xml
share/qtcreator/externaltools/qmlscene.xml
share/qtcreator/externaltools/qmlviewer.xml
-share/qtcreator/externaltools/sort.xml
share/qtcreator/externaltools/vi.xml
share/qtcreator/fonts/
share/qtcreator/fonts/SourceCodePro-Bold.ttf
@@ -372,69 +371,6 @@ share/qtcreator/qmldesigner/itemLibraryQ
share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Button.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRow2.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorCheckButton.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpandingSpacer.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExpressionTextField.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GradientLine.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/GroupBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/HueSlider.qml
-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
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ScrollView.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SecondColumnLayout.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Section.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SectionLayout.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/StandardTextSection.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Tab.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/TabView.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ToolTipArea.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/checkers.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/[email protected]
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/[email protected]
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_gradient.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_none.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/icon_color_solid.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/[email protected]
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/[email protected]
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/[email protected]
-share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template
@@ -480,6 +416,70 @@ share/qtcreator/qmldesigner/propertyEdit
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Window/WindowSpecifics.qml
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/AligmentHorizontalButtons.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentVerticalButtons.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AnchorButtons.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/BoolButtonRowButton.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRow2.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
+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/ColorLogic.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Constants.js
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomCheckBoxStyle.qml
+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/ExpandingSpacer.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionButton.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/GradientLine.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/Label.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.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
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml
+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/SpinBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Tab.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TabView.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ToolTipArea.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/checkers.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/[email protected]
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/[email protected]
+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_solid.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/[email protected]
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/submenu.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/[email protected]
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/[email protected]
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir
share/qtcreator/qmldesigner/statesEditorQmlSources/
share/qtcreator/qmldesigner/statesEditorQmlSources/DesignerTextFieldStyle.qml
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
@@ -711,50 +711,54 @@ share/qtcreator/templates/wizards/projec
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/qtcanvas3dapplication/
-share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/3dapplication.png
-share/qtcreator/templates/wizards/projects/qtcanvas3dapplication/[email protected]
-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/app.qbs
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/icon.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/[email protected]
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/plaincanvas3d/
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/plaincanvas3d/glcode.js
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/threejs/
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/threejs/3rdparty/
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/threejs/3rdparty/three.js
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/threejs/glcode.js
+share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/[email protected]
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
share/qtcreator/templates/wizards/projects/qtquickapplication/file.qbs
-share/qtcreator/templates/wizards/projects/qtquickapplication/icon-empty.png
-share/qtcreator/templates/wizards/projects/qtquickapplication/[email protected]
-share/qtcreator/templates/wizards/projects/qtquickapplication/icon-scroll.png
-share/qtcreator/templates/wizards/projects/qtquickapplication/[email protected]
-share/qtcreator/templates/wizards/projects/qtquickapplication/icon-stack.png
-share/qtcreator/templates/wizards/projects/qtquickapplication/[email protected]
-share/qtcreator/templates/wizards/projects/qtquickapplication/icon-swipe.png
-share/qtcreator/templates/wizards/projects/qtquickapplication/[email protected]
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/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/qtquickapplication/qtquickcontrols2.conf
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/[email protected]
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/[email protected]
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.ui.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon.png
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/[email protected]
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/qml.qrc
+share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
share/qtcreator/templates/wizards/projects/qtquickuiprototype/
share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject
share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png
