Hi ports@, Please find below an update to 4.2.2 with many fixes and a qtdeclarative loop workaround.
- bump some SHARED_LIBS (nm(1) checks) - remove qch_docs target and all -docindex BUILD_DEPENDS for a hopefully qtdeclarative loop workaround [1] - improve licence tag; thanks Caspar Schutijser - Fix WANTLIB - NO_TEST - remove qtwebkit as LIB_DEPENDS and add ass RUN_DEPENDS - fix one tab [1]: https://marc.info/?l=openbsd-ports&m=148940461515216&w=2 Best regards, Rafael Sadowski Index: Makefile =================================================================== RCS file: /cvs/ports/devel/qt-creator/Makefile,v retrieving revision 1.20 diff -u -p -u -p -r1.20 Makefile --- Makefile 31 Dec 2016 12:53:42 -0000 1.20 +++ Makefile 26 Apr 2017 06:18:50 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.20 2016/12/31 12:53:42 zhuk Exp $ COMMENT = cross-platform IDE for use with Qt -V = 4.1.0 +V = 4.2.2 DISTNAME = qt-creator-opensource-src-${V} PKGNAME = qt-creator-${V} @@ -11,20 +11,21 @@ PKGNAME = qt-creator-${V} SHARED_LIBS += Aggregation 0.0 # 0.0 SHARED_LIBS += CPlusPlus 0.0 # 0.0 -SHARED_LIBS += ExtensionSystem 0.0 # 0.0 +SHARED_LIBS += ExtensionSystem 1.0 # 0.0 SHARED_LIBS += GLSL 0.0 # 0.0 SHARED_LIBS += LanguageUtils 0.0 # 0.0 -SHARED_LIBS += QmlDebug 0.0 # 0.0 +SHARED_LIBS += QmlDebug 1.0 # 0.0 SHARED_LIBS += QmlEditorWidgets 0.0 # 0.0 -SHARED_LIBS += QmlJS 0.0 # 0.0 +SHARED_LIBS += QmlJS 1.0 # 0.0 SHARED_LIBS += QtcSsh 0.0 # 0.0 -SHARED_LIBS += Utils 0.0 # 0.0 -SHARED_LIBS += qbscore 0.0 # 0.0 -SHARED_LIBS += Clangbackendipc 1.0 # 1.0 -SHARED_LIBS += Sqlite 1.0 # 1.0 -SHARED_LIBS += Timeline 1.0 # 1.0 +SHARED_LIBS += Utils 1.0 # 0.0 +SHARED_LIBS += qbscore 1.0 # 0.0 +SHARED_LIBS += Clangbackendipc 1.1 # 1.0 +SHARED_LIBS += Sqlite 1.1 # 1.0 +SHARED_LIBS += Timeline 1.1 # 1.0 SHARED_LIBS += qbsqtprofilesetup 1.4 # 1.4 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} @@ -35,14 +36,13 @@ CATEGORIES = devel editors HOMEPAGE = https://www.qt.io/ide/ -# XXX GPLv3 with some exceptions +# GPLv3 with the "Qt Company GPL Exception 1.0" PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c kvm m pthread WANTLIB += GL Qt5Concurrent Qt5Core Qt5Designer Qt5DesignerComponents WANTLIB += Qt5Gui Qt5Help Qt5Network Qt5PrintSupport Qt5Qml Qt5Quick -WANTLIB += Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg Qt5WebKit Qt5WebKitWidgets -WANTLIB += Qt5Widgets Qt5Xml +WANTLIB += Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg Qt5Widgets +WANTLIB += Qt5Xml c kvm m pthread MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/ @@ -53,30 +53,25 @@ MODQT5_USE_GCC4_MODULE = No MODGCC4_LANGS = c++ MODGCC4_ARCHS = * -BUILD_DEPENDS = x11/qt5/qtquickcontrols \ - x11/qt5/qtdeclarative,-docindex \ - x11/qt5/qtdoc,-docindex \ - x11/qt5/qtquickcontrols,-docindex \ - x11/qt5/qtquickcontrols2,-docindex \ - x11/qt5/qtsensors,-docindex +BUILD_DEPENDS = x11/qt5/qtquickcontrols RUN_DEPENDS = devel/gdb \ devel/gmake \ lang/gcc/${MODGCC4_VERSION},-c++ \ x11/gtk+3,-guic \ + x11/qt5/qtwebkit \ x11/qt5/qtquickcontrols LIB_DEPENDS = x11/qt5/qtdeclarative \ x11/qt5/qtscript \ x11/qt5/qtsvg \ - x11/qt5/qttools \ - x11/qt5/qtwebkit + x11/qt5/qttools PORTHOME = ${WRKDIR} -ALL_TARGET = all qch_docs +ALL_TARGET = all -#NO_TEST = Yes +NO_TEST = Yes FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX} GDB_ADJ_FILES = \ @@ -93,8 +88,5 @@ post-install: .for _l _v in ${SHARED_LIBS} ln -sf qtcreator/lib${_l}.so.${_v} ${PREFIX}/lib .endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qtcreator - ${INSTALL_DATA} ${WRKBUILD}/share/doc/qtcreator/qtcreator.qch \ - ${PREFIX}/share/doc/qtcreator/qtcreator.qch .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/qt-creator/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 26 Dec 2016 15:26:01 -0000 1.3 +++ distinfo 26 Apr 2017 06:18:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (qt-creator-opensource-src-4.1.0.tar.gz) = QSwCI9v9hpg7OeEOLHy0K1MJlc/i86o1Keo/GwD/tAM= -SIZE (qt-creator-opensource-src-4.1.0.tar.gz) = 22342296 +SHA256 (qt-creator-opensource-src-4.2.2.tar.gz) = BALw4zvzyO5/icZz8l/Pdf7wO6QmLgd9nZ9CRU0eeZs= +SIZE (qt-creator-opensource-src-4.2.2.tar.gz) = 22574932 Index: patches/patch-doc_doc_pri =================================================================== RCS file: patches/patch-doc_doc_pri diff -N patches/patch-doc_doc_pri --- patches/patch-doc_doc_pri 26 Dec 2016 15:26:01 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -$OpenBSD: patch-doc_doc_pri,v 1.2 2016/12/26 15:26:01 zhuk Exp $ ---- doc/doc.pri.orig Tue Aug 23 14:36:42 2016 -+++ doc/doc.pri Sat Oct 22 12:44:49 2016 -@@ -28,14 +28,14 @@ HELP_DEP_FILES = $$PWD/src/qtcreator.qdoc \ - $$PWD/config/qt-cpp-ignore.qdocconf \ - $$PWD/config/qt-defines.qdocconf - --html_docs.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator.qdocconf -+html_docs.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator.qdocconf && touch $@ - html_docs.depends += $$HELP_DEP_FILES - html_docs.files = $$QHP_FILE - --html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator-online.qdocconf -+html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator-online.qdocconf && touch $@ - html_docs_online.depends += $$HELP_DEP_FILES - --qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE -+qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE && touch $@ - qch_docs.depends += html_docs - - DEV_QHP_FILE = $$OUT_PWD/doc/html-dev/qtcreator-dev.qhp -@@ -57,13 +57,13 @@ DEV_HELP_DEP_FILES = \ - $$PWD/api/qtcreator-ui-text.qdoc \ - $$PWD/api/qtcreator-dev.qdocconf - --dev_html_docs.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev.qdocconf -+dev_html_docs.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev.qdocconf && touch $@ - dev_html_docs.depends += $$DEV_HELP_DEP_FILES - --dev_html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev-online.qdocconf -+dev_html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev-online.qdocconf && touch $@ - dev_html_docs_online.depends += $$DEV_HELP_DEP_FILES - --dev_qch_docs.commands = $$HELPGENERATOR -o \"$$DEV_QCH_FILE\" $$DEV_QHP_FILE -+dev_qch_docs.commands = $$HELPGENERATOR -o \"$$DEV_QCH_FILE\" $$DEV_QHP_FILE && touch $@ - dev_qch_docs.depends += dev_html_docs - - inst_qch_docs.files = $$QCH_FILE Index: patches/patch-src_libs_utils_buildablehelperlibrary_cpp =================================================================== RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_libs_utils_buildablehelperlibrary_cpp --- patches/patch-src_libs_utils_buildablehelperlibrary_cpp 26 Dec 2016 15:26:01 -0000 1.1 +++ patches/patch-src_libs_utils_buildablehelperlibrary_cpp 26 Apr 2017 06:18:50 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-src_libs_utils_buildable Prefer qmake-qt5 to qmake4 by removing the QDir::Reversed flag. ---- src/libs/utils/buildablehelperlibrary.cpp.orig Tue Aug 23 14:36:42 2016 -+++ src/libs/utils/buildablehelperlibrary.cpp Sat Oct 22 12:44:49 2016 -@@ -85,8 +85,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En +--- src/libs/utils/buildablehelperlibrary.cpp.orig Wed Mar 22 09:25:13 2017 ++++ src/libs/utils/buildablehelperlibrary.cpp Mon Apr 24 18:05:10 2017 +@@ -86,8 +86,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En return FileName::fromString(qmakePath); } Index: patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp =================================================================== RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_plugins_projectexplorer_gcctoolchain_cpp --- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 26 Dec 2016 15:26:01 -0000 1.1 +++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 26 Apr 2017 06:18:50 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-src_plugins_projectexplo Append eg++ before g++ so eg++ is used by default. ---- src/plugins/projectexplorer/gcctoolchain.cpp.orig Fri Dec 9 10:55:44 2016 -+++ src/plugins/projectexplorer/gcctoolchain.cpp Fri Dec 16 09:54:30 2016 -@@ -605,7 +605,7 @@ FileNameList GccToolChain::suggestedMkspecList() const +--- 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 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.1 diff -u -p -u -p -r1.1 patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp --- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 26 Dec 2016 15:26:01 -0000 1.1 +++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 26 Apr 2017 06:18:50 -0000 @@ -4,9 +4,9 @@ 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 Tue Aug 23 14:36:42 2016 -+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp Fri Dec 16 09:57:01 2016 -@@ -677,6 +677,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon +--- 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 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.1 diff -u -p -u -p -r1.1 patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp --- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 26 Dec 2016 15:26:01 -0000 1.1 +++ patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 26 Apr 2017 06:18:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.1 2016/12/26 15:26:01 zhuk Exp $ ---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig Fri Aug 19 09:23:24 2016 -+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp Fri Dec 16 09:57:01 2016 -@@ -40,6 +40,11 @@ +--- 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 +@@ -49,6 +49,11 @@ # include "fileinfo.h" # include <unistd.h> # include <cstdio> @@ -13,7 +13,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_c #elif defined(Q_OS_BSD4) # include <QFile> # include <sys/cdefs.h> -@@ -85,6 +90,19 @@ QString processNameByPid(qint64 pid) +@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid) sprintf(exePath, "/proc/%lld/exe", pid); readlink(exePath, buf, sizeof(buf)); return FileInfo::fileName(QString::fromUtf8(buf)); 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.1 diff -u -p -u -p -r1.1 patch-src_shared_qbs_src_lib_corelib_tools_tools_pri --- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 26 Dec 2016 15:26:01 -0000 1.1 +++ patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 26 Apr 2017 06:18:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.1 2016/12/26 15:26:01 zhuk Exp $ ---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig Fri Aug 19 09:23:24 2016 -+++ src/shared/qbs/src/lib/corelib/tools/tools.pri Fri Dec 16 09:57:01 2016 -@@ -88,6 +88,8 @@ osx { +--- 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 { LIBS += -framework Security } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 26 Dec 2016 15:26:01 -0000 1.3 +++ pkg/PLIST 26 Apr 2017 06:18:50 -0000 @@ -12,6 +12,7 @@ bin/qtcreator.sh @lib lib/libCPlusPlus.so.${LIBCPlusPlus_VERSION} @lib lib/libClangbackendipc.so.${LIBClangbackendipc_VERSION} @lib lib/libExtensionSystem.so.${LIBExtensionSystem_VERSION} +@lib lib/libFlameGraph.so.${LIBFlameGraph_VERSION} @lib lib/libGLSL.so.${LIBGLSL_VERSION} @lib lib/libLanguageUtils.so.${LIBLanguageUtils_VERSION} @lib lib/libModeling.so.${LIBModeling_VERSION} @@ -29,6 +30,7 @@ lib/qtcreator/ @lib lib/qtcreator/libCPlusPlus.so.${LIBCPlusPlus_VERSION} @lib lib/qtcreator/libClangbackendipc.so.${LIBClangbackendipc_VERSION} @lib lib/qtcreator/libExtensionSystem.so.${LIBExtensionSystem_VERSION} +@lib lib/qtcreator/libFlameGraph.so.${LIBFlameGraph_VERSION} @lib lib/qtcreator/libGLSL.so.${LIBGLSL_VERSION} @lib lib/qtcreator/libLanguageUtils.so.${LIBLanguageUtils_VERSION} @lib lib/qtcreator/libModeling.so.${LIBModeling_VERSION} @@ -90,6 +92,7 @@ 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/libSubversion.so lib/qtcreator/plugins/libTaskList.so lib/qtcreator/plugins/libTextEditor.so @@ -113,8 +116,6 @@ libexec/qtcreator/ @bin libexec/qtcreator/qtcreator_process_stub @bin libexec/qtcreator/qtpromaker @bin libexec/qtcreator/sdktool -share/doc/qtcreator/ -share/doc/qtcreator/qtcreator.qch share/icons/hicolor/128x128/apps/QtProject-qtcreator.png share/icons/hicolor/16x16/apps/QtProject-qtcreator.png share/icons/hicolor/24x24/apps/QtProject-qtcreator.png @@ -132,11 +133,13 @@ share/qtcreator/debugger/ share/qtcreator/debugger/LICENSE.GPL3-EXCEPT share/qtcreator/debugger/README.txt share/qtcreator/debugger/boosttypes.py +share/qtcreator/debugger/cdbbridge.py share/qtcreator/debugger/creatortypes.py share/qtcreator/debugger/dumper.py share/qtcreator/debugger/gdbbridge.py share/qtcreator/debugger/lldbbridge.py share/qtcreator/debugger/misctypes.py +share/qtcreator/debugger/opencvtypes.py share/qtcreator/debugger/pdbbridge.py share/qtcreator/debugger/personaltypes.py share/qtcreator/debugger/qttypes.py @@ -278,6 +281,7 @@ share/qtcreator/qbs/share/qbs/imports/qb share/qtcreator/qbs/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs share/qtcreator/qbs/share/qbs/imports/qbs/Probes/GccProbe.qbs share/qtcreator/qbs/share/qbs/imports/qbs/Probes/IncludeProbe.qbs +share/qtcreator/qbs/share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs share/qtcreator/qbs/share/qbs/imports/qbs/Probes/JdkProbe.qbs share/qtcreator/qbs/share/qbs/imports/qbs/Probes/MsvcProbe.qbs share/qtcreator/qbs/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs @@ -298,6 +302,7 @@ share/qtcreator/qbs/share/qbs/imports/qb share/qtcreator/qbs/share/qbs/imports/qbs/base/AutotestRunner.qbs share/qtcreator/qbs/share/qbs/imports/qbs/base/CppApplication.qbs share/qtcreator/qbs/share/qbs/imports/qbs/base/DynamicLibrary.qbs +share/qtcreator/qbs/share/qbs/imports/qbs/base/InnoSetup.qbs share/qtcreator/qbs/share/qbs/imports/qbs/base/InstallPackage.qbs share/qtcreator/qbs/share/qbs/imports/qbs/base/JavaClassCollection.qbs share/qtcreator/qbs/share/qbs/imports/qbs/base/JavaJarFile.qbs @@ -352,6 +357,8 @@ share/qtcreator/qbs/share/qbs/modules/cp share/qtcreator/qbs/share/qbs/modules/ib/ share/qtcreator/qbs/share/qbs/modules/ib/IBModule.qbs share/qtcreator/qbs/share/qbs/modules/ib/ib.js +share/qtcreator/qbs/share/qbs/modules/innosetup/ +share/qtcreator/qbs/share/qbs/modules/innosetup/InnoSetupModule.qbs share/qtcreator/qbs/share/qbs/modules/java/ share/qtcreator/qbs/share/qbs/modules/java/JavaModule.qbs share/qtcreator/qbs/share/qbs/modules/java/io/ @@ -487,6 +494,8 @@ share/qtcreator/qml/qmlpuppet/container/ share/qtcreator/qml/qmlpuppet/container/informationcontainer.h share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp share/qtcreator/qml/qmlpuppet/container/instancecontainer.h +share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.cpp +share/qtcreator/qml/qmlpuppet/container/mockuptypecontainer.h share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp @@ -515,6 +524,7 @@ share/qtcreator/qml/qmlpuppet/interfaces share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h share/qtcreator/qml/qmlpuppet/mockfiles/ +share/qtcreator/qml/qmlpuppet/mockfiles/GenericBackend.qml share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml share/qtcreator/qml/qmlpuppet/qml2puppet/ share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist @@ -611,6 +621,7 @@ share/qtcreator/qmldesigner/propertyEdit 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 @@ -623,6 +634,7 @@ share/qtcreator/qmldesigner/propertyEdit share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Label.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.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 @@ -866,6 +878,10 @@ share/qtcreator/templates/wizards/files/ share/qtcreator/templates/wizards/files/nim/file.nim share/qtcreator/templates/wizards/files/nim/icon.png share/qtcreator/templates/wizards/files/nim/wizard.json +share/qtcreator/templates/wizards/files/nimscript/ +share/qtcreator/templates/wizards/files/nimscript/file.nims +share/qtcreator/templates/wizards/files/nimscript/icon.png +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/wizard.json @@ -928,14 +944,6 @@ share/qtcreator/templates/wizards/projec 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/qtlabscontrolsapplication/ -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/Page1.qml.tpl -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/Page1Form.ui.qml.tpl -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/app.pro -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/main.cpp -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/main.qml.tpl -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/qml.qrc -share/qtcreator/templates/wizards/projects/qmake/qtlabscontrolsapplication/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 @@ -951,6 +959,7 @@ share/qtcreator/templates/wizards/projec 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 @@ -1072,16 +1081,14 @@ share/qtcreator/welcomescreen/widgets/im 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/components.png share/qtcreator/welcomescreen/widgets/images/icons/ddays13.png share/qtcreator/welcomescreen/widgets/images/icons/ddays14.png -share/qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png -share/qtcreator/welcomescreen/widgets/images/icons/qt_sdk.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
