diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qt-creator/metadata.xml | 6 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 6 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133808.patch | 12 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.8.2-r2.ebuild (renamed from dev-qt/qtbase/qtbase-6.8.2-r1.ebuild) | 1 |
4 files changed, 24 insertions, 1 deletions
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 44e472f45a98..d0b42ff4836c 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -14,7 +14,11 @@ <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> <flag name="serialterminal">Build the serial terminal plugin</flag> <flag name="tracing">Build plugins for tracing requiring extra dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, QmlProfiler)</flag> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> + <flag name="webengine"> + Allow using <pkg>dev-qt/qtwebengine</pkg> for + better USE=help display, and for Design Viewer + Connector support with USE=qmldesigner + </flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 3ed1685d4f1f..248b71441708 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -71,6 +71,8 @@ COMMON_DEPEND=" qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} + >=dev-qt/qtwebsockets-${QT_PV} + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) svg? ( >=dev-qt/qtsvg-${QT_PV} ) @@ -184,6 +186,10 @@ src_configure() { # https://bugreports.qt.io/browse/QTCREATORBUG-29169 $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + # help shouldn't use with the above, but qmldesigner is automagic + $(use help || use qmldesigner && + cmake_use_find_package webengine Qt6WebEngineWidgets) + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) -DENABLE_SVG_SUPPORT=$(usex svg) $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925 diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133808.patch b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133808.patch new file mode 100644 index 000000000000..f15eb4167686 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133808.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/949629 +https://bugreports.qt.io/browse/QTBUG-133808 +https://codereview.qt-project.org/c/qt/qtbase/+/624870 +--- a/src/corelib/global/qcompare_impl.h ++++ b/src/corelib/global/qcompare_impl.h +@@ -13,4 +13,6 @@ + #include <QtCore/qcompilerdetection.h> + ++#include <type_traits> ++ + QT_BEGIN_NAMESPACE + diff --git a/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild index af4d6a54a114..2a5d8cbc90ac 100644 --- a/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch "${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch "${FILESDIR}"/${P}-QTBUG-133500.patch + "${FILESDIR}"/${P}-QTBUG-133808.patch ) src_prepare() { |