Attachment 231973 Details for Bug 262078 – Update devel/qtcreator to 6.0.2, build with CMake.

[patch] Update devel/qtcreator to 6.0.2, build with CMake.

devel-qtcreator-Update-to-6.0.2-CMake-build.patch (text/plain), 27.37 KB, created by Florian Walpen on 2022-02-20 22:40:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2022-02-20 22:40:18 UTC

Size: 27.37 KB

patch

obsolete

>From ac5a2b85d0a119ad18c5522b04bc24f2b20b8112 Mon Sep 17 00:00:00 2001
>From: Florian Walpen <dev@submerge.ch>
>Date: Fri, 18 Feb 2022 14:07:41 +0100
>Subject: [PATCH] devel/qtcreator: Update to 6.0.2, CMake build.
>
>Update Qt Creator to 6.0.2, see the official changelogs:
>https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-6.0.0.md
>https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-6.0.1.md
>https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-6.0.2.md
>
>Port changes:
>Build with CMake instead of QMake, as advised by upstream. Add missing libraries
>and dependencies. Use textproc/kf5-syntax-highlighting for syntax highlighting
>instead of an internal copy. Clang code model depends on LLVM 13 now.
>---
> devel/qtcreator/Makefile                      | 116 +++++------
> devel/qtcreator/distinfo                      |   6 +-
> .../patch-src_libs_3rdparty_sqlite_sqlite.pri |  10 -
> .../patch-src_libs_sqlite_CMakeLists.txt      |  11 +
> devel/qtcreator/pkg-plist                     | 192 +++++++-----------
> 5 files changed, 142 insertions(+), 193 deletions(-)
> delete mode 100644 devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite.pri
> create mode 100644 devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt
>
>diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
>index b7de8f357629..332566476c68 100644
>--- a/devel/qtcreator/Makefile
>+++ b/devel/qtcreator/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Kris Moore <kris@pcbsd.org>
> 
> PORTNAME=	qtcreator
>-DISTVERSION=	5.0.3
>-PORTREVISION=	1
>+DISTVERSION=	6.0.2
> CATEGORIES=	devel
> MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
> DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
>@@ -18,54 +17,21 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.GPL3-EXCEPT
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
> # depend on the split out qbs
>-LIB_DEPENDS=	libqbscore.so:devel/qbs
> BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
>+LIB_DEPENDS=	libKF5SyntaxHighlighting.so:textproc/kf5-syntax-highlighting \
>+		libqbscore.so:devel/qbs \
>+		libzstd.so:archivers/zstd
> RUN_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
> 
>-USES=		compiler:c++14-lang gl python qmake qt:5 shebangfix tar:xz
>-USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
>+USES=		compiler:c++14-lang pkgconfig cmake gl python qt:5 shebangfix tar:xz \
>+		desktop-file-utils
> USE_GL=		gl
>+USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
> USE_QT=		buildtools concurrent core declarative designer gui help \
> 		linguist location network printsupport qdoc qmake \
>-		quickcontrols script script serialport sql svg webchannel \
>+		quick3d quickcontrols script serialport sql svg webchannel \
> 		widgets xml xmlpatterns
> 
>-# be paranoid and do not extract qbs (devel/qbs) copy from source tree
>-EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/src/shared/qbs'
>-# Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build
>-# the qbsprojectmanager plugin without compile error
>-QMAKE_ARGS+=	QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_enable_project_file_updates
>-
>-# Enforce installation to ${PREFIX}.
>-QMAKE_ARGS+=	QTC_PREFIX=${PREFIX} LLVM_INSTALL_DIR=${PREFIX}/llvm${LLVM_DEFAULT}
>-
>-DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \
>-		"${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true
>-
>-PORTDOCS=		*
>-
>-OPTIONS_DEFINE=		DOCS EXAMPLES QTWEBENGINE
>-OPTIONS_SUB=		yes
>-DOCS_DESC=		Install the Qt5 api documentation
>-DOCS_USE=		QT=doc_run
>-EXAMPLES_DESC=		Install the Qt5 example projects
>-EXAMPLES_USE=		QT=examples_run
>-OPTIONS_DEFAULT=	DOCS EXAMPLES
>-OPTIONS_DEFAULT_amd64=	QTWEBENGINE
>-OPTIONS_DEFAULT_i386=	QTWEBENGINE
>-
>-QTWEBENGINE_DESC=	Add dependency on qt5-webengine
>-QTWEBENGINE_USE=	qt=webengine
>-QTWEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
>-
>-ALL_TARGET=		all
>-INSTALL_TARGET=		install
>-
>-DOCS_ALL_TARGET=	docs
>-DOCS_INSTALL_TARGET=	install_docs
>-
>-PLIST_SUB=		SHLIB_VER="${PORTVERSION}"
>-
> SHEBANG_FILES=		tests/system/tools/objectsToTable.py \
> 			tests/system/tools/findUnusedObjects.py \
> 			share/qtcreator/templates/wizards/files/python/file.py \
>@@ -84,33 +50,55 @@ SHEBANG_FILES=		tests/system/tools/objectsToTable.py \
> 			scripts/uichanges.py \
> 			scripts/makedmg.py
> 
>+# Provide library paths, default llvm first as a hint to the clang code model.
>+CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH:STRING="${PREFIX}/llvm${LLVM_DEFAULT};${PREFIX}"
>+# Prevent accidental pickup of devel/elfutils libraries.
>+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_elfutils
>+# Disable precompiled headers for now, they are missing compile flags.
>+CMAKE_OFF=	BUILD_WITH_PCH
>+
>+LDFLAGS+=	-lexecinfo
>+
>+# be paranoid and do not extract qbs (devel/qbs) copy from source tree
>+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/src/shared/qbs'
>+
>+PLIST_SUB=		SHLIB_VER="${PORTVERSION}"
>+PORTDOCS=		*
>+
>+OPTIONS_DEFINE=		DOCS EXAMPLES QTWEBENGINE
>+OPTIONS_DEFAULT=	DOCS EXAMPLES
>+OPTIONS_DEFAULT_amd64=	QTWEBENGINE
>+OPTIONS_DEFAULT_i386=	QTWEBENGINE
>+OPTIONS_SUB=		yes
>+
>+DOCS_DESC=		Install the Qt5 api documentation
>+EXAMPLES_DESC=		Install the Qt5 example projects
>+QTWEBENGINE_DESC=	Add dependency on qt5-webengine
>+
>+DOCS_USE=		QT=doc_run
>+DOCS_CMAKE_BOOL=	WITH_DOCS
>+
>+EXAMPLES_USE=		QT=examples_run
>+
>+QTWEBENGINE_USE=	qt=webengine
>+QTWEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
>+
> .include <bsd.port.pre.mk>
> 
> # Force a modern LLVM >= 10
> .if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} > 80
>-LLVM_DEFAULT=	11
>+LLVM_DEFAULT=	13
> .endif
> 
>-post-patch:
>-# Fix python binary in pro file.
>-	${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \
>-				${WRKSRC}/qtcreator.pro
>-
>-pre-configure:
>-# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
>-# the linker before -L/usr/local/lib. By default, the opposite happens, which
>-# is a problem when a Qt port is being upgraded, since an existing library
>-# would end up being picked up instead of those built in ${WRKSRC}/lib. Since
>-# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
>-# latter to get the linker path order right. qmake is smart enough to strip
>-# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
>-# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
>-	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache
>-
>-post-stage:
>-# There is **one** qmldir file that is staged, which gets stripped.
>-# Since it's a text file, strip complains / falls over, but it does
>-# leave a 0-size file behind. That in turn trips up check-plist.
>-	${RM} ${STAGEDIR}/${PREFIX}/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ecp.*
>+# Documentation is excluded from the default build targets.
>+do-build-DOCS-on:
>+	${CMAKE_BIN} --build ${BUILD_WRKSRC} --target docs
>+
>+# This also means separate install steps for documentation.
>+do-install-DOCS-on:
>+	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} \
>+	    --component qch_docs
>+	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} \
>+	    --component html_docs
> 
> .include <bsd.port.post.mk>
>diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo
>index 02915a7f00f0..11373df25455 100644
>--- a/devel/qtcreator/distinfo
>+++ b/devel/qtcreator/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1636200663
>-SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-5.0.3.tar.xz) = 7fd3b14310bcecee6b134f8cb7f4c0ed2385d7f4cecd48d756c5c1fd650ce2eb
>-SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-5.0.3.tar.xz) = 45497604
>+TIMESTAMP = 1645295631
>+SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-6.0.2.tar.xz) = 3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
>+SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-6.0.2.tar.xz) = 44746240
>diff --git a/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite.pri b/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite.pri
>deleted file mode 100644
>index 579f2cdb05fb..000000000000
>--- a/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite.pri
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/libs/3rdparty/sqlite/sqlite.pri.orig	2021-11-15 16:37:07 UTC
>-+++ src/libs/3rdparty/sqlite/sqlite.pri
>-@@ -2,6 +2,7 @@ INCLUDEPATH *= $$PWD
>- 
>- linux:DEFINES += _POSIX_C_SOURCE=200809L _GNU_SOURCE
>- osx:DEFINES += _BSD_SOURCE
>-+freebsd:DEFINES += _POSIX_C_SOURCE=200809L _BSD_SOURCE __XSI_VISIBLE
>- 
>- 
>- HEADERS += $$PWD/sqlite3.h \
>diff --git a/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt b/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt
>new file mode 100644
>index 000000000000..069a1c863d22
>--- /dev/null
>+++ b/devel/qtcreator/files/patch-src_libs_sqlite_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- src/libs/sqlite/CMakeLists.txt.orig	2022-02-17 18:51:21 UTC
>++++ src/libs/sqlite/CMakeLists.txt
>+@@ -47,6 +47,8 @@ extend_qtc_library(Sqlite DEFINES _HAVE_SQLITE_CONFIG_
>+ 
>+ if (APPLE)
>+ extend_qtc_library(Sqlite DEFINES _BSD_SOURCE)
>++elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>++extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _BSD_SOURCE __XSI_VISIBLE)
>+ elseif (UNIX)
>+ extend_qtc_library(Sqlite DEFINES _POSIX_C_SOURCE=200809L _GNU_SOURCE _DEFAULT_SOURCE)
>+ endif()
>diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist
>index 17a3981f4a78..ba5d95d75407 100644
>--- a/devel/qtcreator/pkg-plist
>+++ b/devel/qtcreator/pkg-plist
>@@ -1,75 +1,42 @@
> bin/qtcreator
>-lib/qtcreator/libAdvancedDockingSystem.so
>-lib/qtcreator/libAdvancedDockingSystem.so.5
>-lib/qtcreator/libAdvancedDockingSystem.so.5.0
>+bin/qtcreator.sh
>+lib/qtcreator/libAdvancedDockingSystem.so.6
> lib/qtcreator/libAdvancedDockingSystem.so.%%SHLIB_VER%%
>-lib/qtcreator/libAggregation.so
>-lib/qtcreator/libAggregation.so.5
>-lib/qtcreator/libAggregation.so.5.0
>+lib/qtcreator/libAggregation.so.6
> lib/qtcreator/libAggregation.so.%%SHLIB_VER%%
>-lib/qtcreator/libCPlusPlus.so
>-lib/qtcreator/libCPlusPlus.so.5
>-lib/qtcreator/libCPlusPlus.so.5.0
>+lib/qtcreator/libCPlusPlus.so.6
> lib/qtcreator/libCPlusPlus.so.%%SHLIB_VER%%
>-lib/qtcreator/libClangsupport.so
>-lib/qtcreator/libClangsupport.so.5
>-lib/qtcreator/libClangsupport.so.5.0
>-lib/qtcreator/libClangsupport.so.%%SHLIB_VER%%
>-lib/qtcreator/libExtensionSystem.so
>-lib/qtcreator/libExtensionSystem.so.5
>-lib/qtcreator/libExtensionSystem.so.5.0
>+lib/qtcreator/libClangSupport.so.6
>+lib/qtcreator/libClangSupport.so.%%SHLIB_VER%%
>+lib/qtcreator/libExtensionSystem.so.6
> lib/qtcreator/libExtensionSystem.so.%%SHLIB_VER%%
>-lib/qtcreator/libGLSL.so
>-lib/qtcreator/libGLSL.so.5
>-lib/qtcreator/libGLSL.so.5.0
>+lib/qtcreator/libGLSL.so.6
> lib/qtcreator/libGLSL.so.%%SHLIB_VER%%
>-lib/qtcreator/libKSyntaxHighlighting.so
>-lib/qtcreator/libKSyntaxHighlighting.so.5
>-lib/qtcreator/libKSyntaxHighlighting.so.5.0
>-lib/qtcreator/libKSyntaxHighlighting.so.%%SHLIB_VER%%
>-lib/qtcreator/libLanguageServerProtocol.so
>-lib/qtcreator/libLanguageServerProtocol.so.5
>-lib/qtcreator/libLanguageServerProtocol.so.5.0
>+lib/qtcreator/libLanguageServerProtocol.so.6
> lib/qtcreator/libLanguageServerProtocol.so.%%SHLIB_VER%%
>-lib/qtcreator/libLanguageUtils.so
>-lib/qtcreator/libLanguageUtils.so.5
>-lib/qtcreator/libLanguageUtils.so.5.0
>+lib/qtcreator/libLanguageUtils.so.6
> lib/qtcreator/libLanguageUtils.so.%%SHLIB_VER%%
>-lib/qtcreator/libModeling.so
>-lib/qtcreator/libModeling.so.5
>-lib/qtcreator/libModeling.so.5.0
>+lib/qtcreator/libModeling.so.6
> lib/qtcreator/libModeling.so.%%SHLIB_VER%%
>-lib/qtcreator/libQmlDebug.so
>-lib/qtcreator/libQmlDebug.so.5
>-lib/qtcreator/libQmlDebug.so.5.0
>+lib/qtcreator/libProParser.so.6
>+lib/qtcreator/libProParser.so.%%SHLIB_VER%%
>+lib/qtcreator/libQmlDebug.so.6
> lib/qtcreator/libQmlDebug.so.%%SHLIB_VER%%
>-lib/qtcreator/libQmlEditorWidgets.so
>-lib/qtcreator/libQmlEditorWidgets.so.5
>-lib/qtcreator/libQmlEditorWidgets.so.5.0
>+lib/qtcreator/libQmlEditorWidgets.so.6
> lib/qtcreator/libQmlEditorWidgets.so.%%SHLIB_VER%%
>-lib/qtcreator/libQmlJS.so
>-lib/qtcreator/libQmlJS.so.5
>-lib/qtcreator/libQmlJS.so.5.0
>+lib/qtcreator/libQmlJS.so.6
> lib/qtcreator/libQmlJS.so.%%SHLIB_VER%%
>-lib/qtcreator/libQtcSsh.so
>-lib/qtcreator/libQtcSsh.so.5
>-lib/qtcreator/libQtcSsh.so.5.0
>+lib/qtcreator/libQtcSsh.so.6
> lib/qtcreator/libQtcSsh.so.%%SHLIB_VER%%
>-lib/qtcreator/libSqlite.so
>-lib/qtcreator/libSqlite.so.5
>-lib/qtcreator/libSqlite.so.5.0
>+lib/qtcreator/libSqlite.so.6
> lib/qtcreator/libSqlite.so.%%SHLIB_VER%%
>-lib/qtcreator/libTracing.so
>-lib/qtcreator/libTracing.so.5
>-lib/qtcreator/libTracing.so.5.0
>+lib/qtcreator/libTracing.so.6
> lib/qtcreator/libTracing.so.%%SHLIB_VER%%
>-lib/qtcreator/libUtils.so
>-lib/qtcreator/libUtils.so.5
>-lib/qtcreator/libUtils.so.5.0
>+lib/qtcreator/libUtils.so.6
> lib/qtcreator/libUtils.so.%%SHLIB_VER%%
>-lib/qtcreator/libyaml-cpp.so
>-lib/qtcreator/libyaml-cpp.so.5
>-lib/qtcreator/libyaml-cpp.so.5.0
>+lib/qtcreator/libqlitehtml.so.6
>+lib/qtcreator/libqlitehtml.so.%%SHLIB_VER%%
>+lib/qtcreator/libyaml-cpp.so.6
> lib/qtcreator/libyaml-cpp.so.%%SHLIB_VER%%
> lib/qtcreator/plugins/libAndroid.so
> lib/qtcreator/plugins/libAutoTest.so
>@@ -92,7 +59,6 @@ lib/qtcreator/plugins/libCompilationDatabaseProjectManager.so
> lib/qtcreator/plugins/libConan.so
> lib/qtcreator/plugins/libCore.so
> lib/qtcreator/plugins/libCppEditor.so
>-lib/qtcreator/plugins/libCppTools.so
> lib/qtcreator/plugins/libCppcheck.so
> lib/qtcreator/plugins/libCtfVisualizer.so
> lib/qtcreator/plugins/libDebugger.so
>@@ -157,8 +123,11 @@ libexec/qtcreator/cpaster
> libexec/qtcreator/qml2puppet
> libexec/qtcreator/qtc-askpass
> libexec/qtcreator/qtcreator_process_stub
>+libexec/qtcreator/qtcreator_processlauncher
> libexec/qtcreator/qtpromaker
> libexec/qtcreator/sdktool
>+share/applications/org.qt-project.qtcreator.desktop
>+share/metainfo/org.qt-project.qtcreator.appdata.xml
> share/icons/hicolor/128x128/apps/QtProject-qtcreator.png
> share/icons/hicolor/16x16/apps/QtProject-qtcreator.png
> share/icons/hicolor/24x24/apps/QtProject-qtcreator.png
>@@ -176,6 +145,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/cplusplus/examples/tidy_example.h
> %%DATADIR%%/cplusplus/wrappedMingwHeaders/float.h
> %%DATADIR%%/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
>+%%DATADIR%%/debugger/.pylintrc
> %%DATADIR%%/debugger/LICENSE.GPL3-EXCEPT
> %%DATADIR%%/debugger/README.txt
> %%DATADIR%%/debugger/boosttypes.py
>@@ -196,40 +166,12 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/externaltools/lrelease.xml
> %%DATADIR%%/externaltools/lupdate.xml
> %%DATADIR%%/externaltools/qml.xml
>+%%DATADIR%%/externaltools/qmlscene.xml
> %%DATADIR%%/externaltools/vi.xml
> %%DATADIR%%/fonts/SourceCodePro-Bold.ttf
> %%DATADIR%%/fonts/SourceCodePro-It.ttf
> %%DATADIR%%/fonts/SourceCodePro-Regular.ttf
> %%DATADIR%%/fonts/SourceCodePro.txt
>-%%DATADIR%%/generic-highlighter/syntax/alert.xml
>-%%DATADIR%%/generic-highlighter/syntax/autoconf.xml
>-%%DATADIR%%/generic-highlighter/syntax/bash.xml
>-%%DATADIR%%/generic-highlighter/syntax/cmake.xml
>-%%DATADIR%%/generic-highlighter/syntax/comments.xml
>-%%DATADIR%%/generic-highlighter/syntax/css.xml
>-%%DATADIR%%/generic-highlighter/syntax/doxygen.xml
>-%%DATADIR%%/generic-highlighter/syntax/dtd.xml
>-%%DATADIR%%/generic-highlighter/syntax/html.xml
>-%%DATADIR%%/generic-highlighter/syntax/ini.xml
>-%%DATADIR%%/generic-highlighter/syntax/java.xml
>-%%DATADIR%%/generic-highlighter/syntax/javadoc.xml
>-%%DATADIR%%/generic-highlighter/syntax/json.xml
>-%%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.GPLv2
>-%%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.GPLv3
>-%%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.LGPLv21
>-%%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.LGPLv3
>-%%DATADIR%%/generic-highlighter/syntax/makefile.xml
>-%%DATADIR%%/generic-highlighter/syntax/markdown.xml
>-%%DATADIR%%/generic-highlighter/syntax/modelines.xml
>-%%DATADIR%%/generic-highlighter/syntax/perl.xml
>-%%DATADIR%%/generic-highlighter/syntax/powershell.xml
>-%%DATADIR%%/generic-highlighter/syntax/python.xml
>-%%DATADIR%%/generic-highlighter/syntax/qdocconf.xml
>-%%DATADIR%%/generic-highlighter/syntax/ruby.xml
>-%%DATADIR%%/generic-highlighter/syntax/spdx-comments.xml
>-%%DATADIR%%/generic-highlighter/syntax/valgrind-suppression.xml
>-%%DATADIR%%/generic-highlighter/syntax/xml.xml
>-%%DATADIR%%/generic-highlighter/syntax/yacc.xml
> %%DATADIR%%/glsl/glsl_120.frag
> %%DATADIR%%/glsl/glsl_120.vert
> %%DATADIR%%/glsl/glsl_120_common.glsl
>@@ -508,6 +450,8 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/import3d/import3d.pri
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
>+%%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/animationdriver.cpp
>+%%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/animationdriver.h
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
>@@ -565,6 +509,8 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
>+%%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/viewconfig.cpp
>+%%DATADIR%%/qml/qmlpuppet/qml2puppet/instances/viewconfig.h
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/qml2puppet.pri
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/qml2puppet.pro
> %%DATADIR%%/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
>@@ -587,6 +533,38 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
> %%DATADIR%%/qmldesigner/itemLibraryQmlSources/ItemsView.qml
> %%DATADIR%%/qmldesigner/itemLibraryQmlSources/LibraryHeader.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/NewProjectDialog.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/logo.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/logo@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-basic.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-basic@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-default.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-default@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-error.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-error@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-fusion.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-fusion@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-imagine.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-imagine@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-macOs@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-macos.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-material_dark.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-material_dark@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-material_light.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-material_light@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_dark.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_dark@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_light.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_light@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_system.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/image/style-universal_system@2x.png
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/NewProjectDialog/DialogValues.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/NewProjectDialog/NewProjectView.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/NewProjectDialog/qmldir
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/ProjectType/DefaultProject.qml
>+%%DATADIR%%/qmldesigner/newprojectdialog/imports/ProjectType/qmldir
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/FontEditorTemplate.template
>@@ -600,6 +578,13 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/Qt5HelperWindow.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/Qt6HelperWindow.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioOutputSpecifics.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/MediaPlayerSection.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/MediaPlayerSpecifics.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/VideoOutputSpecifics.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/VideoSection.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/VideoSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQml/ConnectionsSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQml/QtObjectPane.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
>@@ -676,6 +661,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/LoaderSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/NumberAnimationSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/ParallelAnimationSpecifics.qml
>@@ -685,6 +671,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/PropertyAnimationSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/RepeaterSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/ScriptActionSpecifics.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/SequentialAnimationSpecifics.qml
>@@ -807,6 +794,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItemWithIcon.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuSeparator.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RadioButton.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBox.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
>@@ -827,6 +815,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextArea.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextField.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TranslationIndicator.qml
>+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/VerticalScrollBar.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml
> %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
>@@ -1073,6 +1062,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/templates/wizards/projects/qtquick2-extension/project.pro
> %%DATADIR%%/templates/wizards/projects/qtquick2-extension/qmldir
> %%DATADIR%%/templates/wizards/projects/qtquick2-extension/wizard.json
>+%%DATADIR%%/templates/wizards/projects/qtquickapplication/CMakeLists.6.x.txt
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/CMakeLists.txt
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/app.pro
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/app.qbs
>@@ -1083,26 +1073,6 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/empty/wizard.json
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/main.cpp
> %%DATADIR%%/templates/wizards/projects/qtquickapplication/qtquickcontrols2.conf
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/scroll/icon.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/scroll/icon@2x.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/scroll/qml.qrc
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/scroll/wizard.json
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/HomeForm.ui.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/Page1Form.ui.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/Page2Form.ui.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/icon.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/icon@2x.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/qml.qrc
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/stack/wizard.json
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/Page1Form.ui.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/Page2Form.ui.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/icon.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/icon@2x.png
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/qml.qrc
>-%%DATADIR%%/templates/wizards/projects/qtquickapplication/swipe/wizard.json
> %%DATADIR%%/templates/wizards/projects/qtquickuiprototype/app.qmlproject
> %%DATADIR%%/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png
> %%DATADIR%%/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype@2x.png
>@@ -1144,16 +1114,6 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
> %%DATADIR%%/templates/wizards/qtcreatorplugin/qtcreatorplugin.png
> %%DATADIR%%/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png
> %%DATADIR%%/templates/wizards/qtcreatorplugin/wizard.json
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/default.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/default@2x.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/material-dark.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/material-dark@2x.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/material-light.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/material-light@2x.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/universal-dark.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/universal-dark@2x.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/universal-light.png
>-%%DATADIR%%/templates/wizards/qtquickstyleicons/universal-light@2x.png
> %%DATADIR%%/themes/dark.creatortheme
> %%DATADIR%%/themes/default.creatortheme
> %%DATADIR%%/themes/design-light.creatortheme
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 262078: 231973